Update usage, list - resolves #2