tabs -> spaces please
nicer error handling
fix failing tests