template updates
improve app generator