Added TODO list and fixed a couple'a bugs