a lot of fx fixes