minor fixes + CraigK ammeter averaging