Fix typos and necessary files not sent in last commit