minor fixes to get it right