Added better help and error messages