Lots of bugs fixed, still a lot of work