fix small little issues found during more extensive testing