Few adjustements to generator. Generator is now fully functional and complete