Fixed broken Elements, and little flaws