update comments. fix outing issues