Fixed "halt on error" option and minor updates