Cleaned code up, 100% untested

Added -help switch