Just some more polishing happened...