Added final fight, major bug fixes