fix merge conflict
putting back a bunch of gsleeps
correcting logic on conn_log, not even calling generator for now