More changes, starting to head in right direction