Tweaks and comments