Fixing bug in matching, changing options script a bit