update comment paradigm and move things around