update examples and tweak option names