some fixes and new elements