Improvements

A few simple improvements. Cuts the time down *significantly*. I can probably do some more optimizations too.