minor tweaks, added some stuff that disappeared

somehow a bunch of changes that i made a while back got deleted so i
tried to put some back in