more comments, small tweaks and fixes