Various Changes

- Scraped the old debug print system
- Added additional command line args
- Reorganized code