fixing more things