Fixed portals, removed debug inc/dec as is buggy.

Also fixed trailing whitespace.