Fixes. Added TODO everywhere