fixing more things...