Development

Bringing in some performance enhancements from dev, hoping to make server run smoother.