Fixes and documentation changes