Some more fixes

Also small commit so Rawrity can sync properly on his fork.
Merge pull request #7 from DatZach/master

Some more fixes