Add tagging observer and other clean ups