Fixing some long-needed issues with the production code.  Mainly hiding ...

...silly warnings done when I was quite amatuer.