Removed some confusing debug messages
Improved selection listener