and fix some missing bits