Added weapon range & damage; cleaned up code.