made fixes per val and matt feedback