2 bugs fixed
Added TODO file