DEV: Add {} when needed and fix a few bugs