Added some picture, improved error messages and new setting