Faster generation
Fixed some things to fit better with Mikes descriptions