a (more) helpful error message, minor tweaks/improvements.