remove debug messages, update comments