Improved packing, added swingworker