bad form Peter, bad form...
fixes and improvements to workflow, error catching