Fixed a few bugs now up to 50/75