Fixed a swap bug + orientation test turned off, too longq