seperation part 2 and packet/settlement tweaks