merge up to 1.4.1 and do more work on the plugins. I'll need to do the error handling soon, this is putrid