moved exceptions to different package
Lots of bugfixes
Moar bugfixes