Refactoring, better errors.
release 0.0.14