some fixes in struct generation
might brake some other generation stuff