Removed moves, make_owning_generator. Also extensively commented