moved charge circuit and cleaned up some