fxing code and more