Fixed a few problems, taking a break for the night now