Second pass at weapons, AI tweaks