more updates for comments doubling etc...