Finished argument parsing and added some args