Updated fandango, minor style fixes