touching up code + better weapon info