Code

Change remote tracking to remote-tracking in non-trivial places