further bug fixes and testing