Fixes, imporove swing extension