Thomson example and small fixes