- Adding more command line options

- Adding more extension methods
- Fixing some references