Stuff :S

Forgot to commit, forgot what I did! Some changes! :)