removing unneeded comments, raising our own error in run(), hacky escape hatch for issue #4