v3.0!!

Cleaned up command line and optimized code