updates, pending bug fix, torpedos collision