more work, cleanup names, remove translation use snap to center