Made singletons more flexible and small improvments to how system properties are handled.