More efficient metadata parsing; comments cleanup
Better category/action/label implementation, removed custom variable tracking
Simplified label recording
Minor comment cleanup