Fixed Rundo's typos and removed unnecessary TODOs