various cosmetic changes for Matt