Improved a lot of stuff

including wepons and shit