Pandora fixes and project file