minor improvements
Add argument parsing