Added timelimit and rerun_time_threshold options
Refactored, increased verbosity