inversion fixes & logging