minor config tidying up
final configuration tweaks