Systematic Changes. Added Listeners and Fixed some Bugs.