Some minor fixes ) Mark)