Fixed some stuff, screwed up other things