Holy hell. Lot's o' fixes from @lozzd and myself.

Trust me...