Some improvs