bug/cosmetic fixes and updates