Added Torpedo, much Bugfixing