minor improvs