improved generator switching behavior and error display (#67)