More notes, reorganized, variable tree spacing