tiny fixes
other code contribs