renamed usage function to help
Extended regex, just because I can
Small edits
Merge branch 'unstable'