Mutliple changes cleaned up code
ready to roll with some dynamic content changes and script building tool.