fixing issues found during testing