Fixes, cheers @ninjalulz
- Small note, looking at what I did, me, myself is wondering what the hell I've written ;p