Updated ToDo list and small fix in statechangeing.