Marked fixes, more code coverage of player fire and prepared submission