Fix DIFE debug output (storage number, tariff, device unit) Fix typos in comments Replace magic bit masks with defines