Several improvs