lot of fx fixes