Add resources; tidy up configuration;