Change var behaviour toggles to tags. Some minor fixes.