Triangles, more objects and fixed error