fixed more things jon screwed up