major changes to minor things