some performance improvements
preparations to handle the beast (pack)