some cleanup and editing. user config is done