Added TODOs for bugs left unaddressed in the last commit