Improved help docs and error messaging