More progress - bug fixes and testing