Added weapon system, minor fixes/improvements