update wx ver num & cleanup and bug #421 fix