sprint 23 updates

@adrocknaphobia Need this by EOD 4/8 to send to localization.