Some re-factoring of settings, plus the ability to watch sources and resources.