More changes. Will review remote details after commit, b4 push.