minor fixes to main