fixed most FIXMEs in the TankInstance constructor