Removed changes to loop_until and updated TODOs