Tweaks and doc, more WIP