additional SPO adjustments

Author has integrated unofficial patch edits, so it's not necessary to
place them before patches after all.