Latest additions to Shower code

Also several macros for comparing to ENGINE added.