Fixed TStrIn, minor changes