rename some vars, add some joshua vars