Updates to XE16; misc cleanup