Updated TODO on readme, tweaks