Watch those callbacks, adds comments