Added new elements and fixed some stuff