Add Usage
Fix handlings of '-' to '_' and var names