Minor fixes and documentation