Minor changes & added new TODOs