Misc updates to shooter and iosched