Worked on lots of stuff, lots of bugs fixed!