added to whitespace, fixed generator issues