Removed address schema.  Improved certain error messages.