Emacs tags
Fixed triangles, cleanup