few more performance-oriented improvements