Fixed a few bugs, and improved the exception macros (based on