Refactors (because I can), improved compatibility failure messages (people freak out when they see stacktraces :P)