more tweaks based on chat with Tom