fixed last few bugs I know of