Touch ups
updated with tylors code
Merge pull request #29 from Excelsior-Systems/tylor-css2

updated with tylors code
Merge pull request #31 from Excelsior-Systems/James_mar20

Touch ups
updated with master