Added a TODO
Changed few && -> if; then; fi. Added a TODO.
Added a TODO