New compile bug to bounce code that was working - fixed + minor comment tidy up
now compiles with all 4 combinations of switch en/disable