fixed variable names -- project is stable/ready-ish