Fixed a wide range of issues with the Singleton implementation
Renamed m_instance to s_instance