added fixes from Frankinstine, added fastcharge