lot of fx fixes...