Fixed portal bug by not using global event triggers

Other minor maintenance