Think I'm finished with most optimizations for now.
modified somthing