Sf content main

MR fixes the EOW if bug, and everything but the last two comments of "Security Force Upgrades bugs". Both doubble checking and those last two will have wait untill later, per ITT. Thanks for the massive help Lillibilli.