Updates to the code

Updates to main for more options.