Major bug fix in the error system, combined the make type functions