Fix some strings and comments