more things to fix