some small improves