Minor changes and improved documentation