WIP: Fixups, voltage update