Spinning triangle, and some cleanup.