Better parsing and error messages in With routine
Better Command error message