Miscellaneous changes.  Setting baseline