More updates; more merging from stacker material