- Now exits properly even when an error is encountered. (Previously, it
may have sat in the background for ages doing nothing.)
 - Small fixes