bug fixes and new elements