more tweaks & additions, take 2