Miscellaneous fixes and enhancements

TBH I think even 'Single' may be better, even 'Singleton' has the association of a static reference.