warnings eliminated, tests added, string Scale changed to enum.