Did some editing to the Track State to make nice

Have not tested it, but it compiles