+ generator input, fix CLI