A bunch of minor changes, renames and the beginning of berries.