a few more performance enhancements