winter: weapons should be 2nd best, not 1st. Some refactoring