Added usage and some minor edits