Add more comments and command line args