more testing and bug fixes