update comments and structures