Documentation and other minor cleanup