Fixes and doc