Fixed tagging
Cleanup debug output