lots of portal fixes