more metatap and fix nitpicks