small fixes and adjustments to structs.