Fixed battery voltage not being unique enough for REGEX by combining it with ID.
Did other small fixes.