reorder/remove some stuff
updates from upstream