Fixed more bugs when changing scale, need to rewrite and make some classes