Cleaned up listeners, more comments.