ahammett: minor changes to vars