some small improve