Update: few minor tweaks