Wrapped overly lines. Improved some error messages.