an assortment of swing-related fixes and improvements