Skip to content

tidy up main and config files