changes from pandora port 2.5.3.2 by TomB