Specs changes. Better error handling. Close #4