removing resolved comments
resolved some bug causing assertion failures