more swt tweaks