cleanup, better macro names, some docstrings
comment popup groups