a few final tweaks, mainly comments