fix structure declarations, add more