Corrected set_extends to accept a None value
Modified TODO list