Some cleanup done, problems persist with loading meter display.