headers added/fixed and singleton improved