finalish tweaks... for now...