made a few changes to the general setup.  Feeling the template