Fix errror when trying to play a file with a + in the filename. Minor cleanup