Fixed up a few tiny things and made error messages user friendly

Signed-off-by: Sam Hellawell <sshellawell@gmail.com>