Improved some scripts
Desktop number in whid