Added an amperage source and fixed a couple bugs