updates and more comments