fixed some deprecated, still a bit to go.