Bug fixes and working fight