Cleaning, doc.
Clean code, doc, minor fixes.