Toolbox: Comments updated