Small fixes. Added some todo tasks. Fixing warnings.