some comments and tweaks