more changes, still learning git