some minor improvments