Tidying up
Added new config parameters