cleaned up use of superuser across templates
big cleanup of plan editing