begin unify 2D scale, fix more gaps