working on fixing issues from testing