Fixes and more doc.