Improved file management, O2 and TKS switches disappear if no data for them