start cleaning up managing sources section
more polishes