a few tweak and more comments