more fixxes