Updated comments
Prepared support for error messages
Now using error messages
Updated comments