main moving + typos