Bug fixes and some new command line arguments

-> 4 space indents.