fix tuna, transport & graphics