Fixes and documentation update.