Added meter line to the charge meter, other minor cleanup.