Adding in max_build_time option, fixing scuttling code.