Update of some missing elements and some fixes.