testing and bug fixes left for analysis