Added TODO's + small fixes and cleanups.