Further Optimizations + Graphics Updates