Minor fixes and improved docs