fixed stuff that was screwed up my merge