Added selectable Listening Function.
Some Cleanup.