Misc changes. Better doc.