minor fixes to match software design