Fixes and improvements of elements