fixing more things!