cleanup + a bit of docs

Subj.