made the glasspane not be an ItemListener, for no apparant reason (it being an ItemListener)
fixed merge