added meta singletons, fixed constants
merged and resolved conflicts