changes, merges, additions galore