Fixed rounding issue. Added TODO's