more checks and fix tagging