improved comments
added proper handing of new and update of aggregate