Fixed up Arguments class some more and use in main