Added command line options, some documentation, more config