Added features to generator and updated some text