some much needed optimizations