New Portal Mode and other fixes