Clarified USAGE, added TODO