Some of the variable names in the options menu cleaned up, needs a bit more though