Editing Riddler, The PL9

The Riddler: PL 9; 

Init +2 (Dex); Defense 19 (17 flat footed); Spd 30 ft; Atk +7 melee (+3S Staff), +9 ranged (+5L Heavy Pistol); SV Dmg +1, Fort +1, Ref +2, Will +3; Str 10, Dex 14, Con 12, Int 20, Wis 16, Cha 14
 
Skills: (synergies and super bonuses counted) Bluff 11, Computers 12, Demolitions 14, Diplomacy 11, Gather Information 6, Innuendo 8, Knowledges (all untrained) 12, Sciences (all untrained) 12, Sense Motive 18, Taunt 8
 
Feats: Assessment, Connected, Expertise, Headquarters (Deathtrap for the Dark knight du jour), Photographic Memory, Pointblank Shot, Rapid Shot, Sidekicks, Skill Focus (Bluff), Skill Focus (Sense Motive), Suprise Strike
 
Powers: Criminal Genius +5 [Super Intelligence; Extras: Innate; Source: Training; Cost 3pp]
 
Equipment: Heavy Pistol, Staff 

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.