Enhancement of Supercapacitor Energy Storage by Leakage Reduction and Electrode Modification