Add TODOs and fix few bugs