minor improvments