change a few option names
fix variable names, use camelcase. condense some options