changed TODOs to comments, left english versions in the strings