WIP: allow generator calculation from serial number; fix comments