Lots of fixes, time to move on to the next ACTUAL feature gosh