touch ups
better error handling in run