Final updates, scale bug fixed