Added comments and more listeners