small generation fixes; english support