Arguments now passed to sub generators

also updated output messages