working on issues from testing