Added new comand line args and other stuff
A few more updates