more efficiency tweaks