fix some error-message, cleanup