more fixes to things and such