Merged some branches and fixed typos