More tweaks after testing