Minor changes, adding variables