lots of bug fixes, lots more lurking around though, so work under progress