Improved documentation more