merge more recent changes from wet site