Completed A2 + fixed typos

Done and working!