some cleanup of issues found in testing