Updated TODO list and fixed bug in InputMappings.