Got hotspot working at last.  Also changes to how files are named in steps and how non-zero error codes get returned on exit