Some fixes + command line arguments