generator partial working
generator working
tewaks
fix paths
tweaks