More helpful comments and error messages.