latest updates/cleanup from FXP/KXP