re-org overlay class, add comments