added gems and some generator additions