Deal with command line argument specifying cfg location, some tidy ups and tidied up prints.