Improve arguments and README