Getting rid of more QR stuff from DataMatrix and adding in symbol info. Other general code cleanup.