fix get method for singleton and small chages in calc processing
change singleton instance storing and updating