Fixes to devel and additions to doc