boilerplate cleaned

Mostly, at least.
small fixes

keep things under 100 cols.