GenerateCode up until ternary node
fixes on return values in expression nodes
fixing merges
fix changes
Bug fixes and merges