Updated a few mistakes

I'm thinking of cleaning and module up this crap.