further tweaks and more comments