More tweaks and fixes!