Improve doc and usage