Some code changes, trying to get relative positions working well.