Updating code copyright, before I forget.
Removed some sloppy singletons.