yay fixed more things