* Cleaned up error messages and location.
* Cleaned up naming.