minor upgrades & optimizations