made some more performance improvements...