Shooter edits, added logging, misc.