typos and moving vars