Removed some comments and added some defaults to the startup parameters