clean up stats, add couple helpers