GeneratorLib changed

Small changes and fixes