Fix bug, update comments