Corrected Documentation and some cleanup