cleaned up option names and moved some things around