SW.17 tun for linux code cleaning and minor corrections