Various fixes. Preparing for fork to test ImagePanel instead of
JLabel.setIcon(ImageIcon)