Added new types, units
Changes to options, Compiling version