Add more primitives, improve error messages
More primitives, use -Operwholecore when calling UHC (workaround to fix
multi-module support)