Tweaks and to-do