Updated some more things, including machine names and such for exceptions
Updated internals