Worked more on Fish game. Fixed more bugs and did some refactoring.