Renamed ComputationGraph back, added collect_variables, some typos