:curly_loop: Fixing a few bugs