few more updates for SIngleton

It feels wrong, why this almost anti-patter receive so much attention?
I probably should go and learn all others deeply instead