fixed error handling and other stuff
v0.0.1-beta2