some tweaks and clarifications on various issues