minor improvments
fixed merge conflict