address all Matt's feedback