Corrected bugs, package.json, improve usage messages