Typos, added elements missing and fix some others