more updates and tweak, playing around with weapons