Fixes and partial documentation