Some updates via @jzaefferer and @kswedberg