Get rid of React warnings
Improve error messages.
Fix indentation