Some optimizations, still better graphics