Updated release with Ken's generation tool fixes