- minor improvs