Minor Tweaks

minor tweaks to exploit generator. Still not quite working.