More notes, reorganize, variable tree spacing.