Tidying up configuration

@WIP still more to do by adding configuration