Minor code improvements
Minor documentation improvements
Add commandline arguments