Fixed broken arg code

Also tidied things up a little and modified the default settings