adding quotes to key param, and bringing var names up to date