Alright, all changes have been made as requested on my CS

[sup]Hopefully that's the last one[/sup]