Improvements to Pandora. Thanks to ptitSeb.