lots of bug fixes and work...