Simplify shapes, fixes