Final merge request before the name change. Mostly this is typos and small corrections