add upstream changes, put options in order of master