More CPU Improvements

This improves the overall cpu usage and a little more support for larger
screens. The CPU is still not to where I would like it.