Perimbó: Bug fixes

Fixed some bugs and add some quality of life changes