adding make generator
Fixed make generator
Fixed compilation errors