Upgraded fandango, general cleanup