Fixed lower case x
Fixes of several todos.