Lots of bug fixes, lots of stuff working