HUGE fix: fields, tyepdef, struct