Improved Universe construction, now using static factory methods along with the private constructor
Cleaner exception throwing with entity registration
General cleanup