fixes and improved docs