bogus linebreak
unused field
small fixes
Merge branch 'master' into portable