charge2 reblocked

added more time to the charge, general cleanup