Fixes Fixes Fixes!

And exception system update