Fixed a few more things :)