Fixed a few more bugs, I am now up to 65/75