minor
error handliong
code generation with changes