minor refactoring and inclusion of swingx-1.6.1