Cosmetical changes and error handling