add-remove-sources and stuff