and fix some error messages where they were wrong or redundant Signed-off-by: Daniel Nephin <dnephin@gmail.com>