Adding ruler, making a few enhancements, cleanup.