add command line options; fix pom conflicts