fixed up some minor issues left over from today's refactorings