Minor tweaks & expansion