Added more Command line arguments + simple fixes