Slightly tweaked portal events and tidied up a couple of other minor things