some minor fixes to clean things up