cleanup namespace, room for addons, stricter activities checking