Simpler xoring
Display fixes & code cleanup