some comments resolved