Some cleanup - and changed example of dynamic options to be more dynamic.