Fixed bugs that arose from the merge.  JLabel now starts successfully, seems to mostly work.