More objects

also more optimization, triangle class