fixing a few leftover issues found during testing