get usage statement back in sync with reality; refactor here and there