better command line handling, and added more commands