fixing more things
moar fixes