actually fixed the input problem,  HAVE TO REMOVE LISTENERS FROM ALL SUPER CLASSES
fixed merge conflict