more tests
cleanups, error messages, ...