more fixes for dev generator
last bug fix