update comments
added special case for ..