Editing Riddler, The PL8

The Riddler: PL 8; 

Init +2 (Dex); Defense 17 (15 flat footed); Spd 30 ft; Atk +6 melee (+3S Cane), +7 ranged (+3L Light Pistol); SV Dmg +2, Fort +2, Ref +2, Will +4; Str 12, Dex 14, Con 14, Int 20, Wis 18, Cha 14
 
Skills: (synergies and super bonuses counted) Bluff 17, Computers 7, Demolitions 7, Diplomacy 11, Gather Information 4, Innuendo 4, Intimidate 4, Knowledges (all untrained) 13, Sciences (all untrained) 13, Sense Motive 19, Taunt 6
 
Feats: Assessment, Headquarters (Deathtrap for the Dark knight du jour), Sidekicks, Talented (Bluff and Sense Motive)
 
Powers: Super Intelligence +8 [Stunts: Eidetic Memory, Mathematical Genius, Speed Reader; Extras: Bluff Expert, Innate, Sense Motive Expert; Flaw: Idiot Savant; Source: Training; Cost 4pp] 

Equipment: (All Devices, All Super Science) Light Pistol [Cost 3pp], Riddler Cane (Weapon +2)[Feature: Tripping Hook; Cost 3pp]
 
Weakness: Quirk (Egomania): The Riddler considers himself peerless when it comes to brainpower. Any time he fails a Sense Motive Check, he must immedeatly spend a Villain point. If he doesn't Riddler becomes panicked and loses control.