much better use of weapons
Small fixes