fix bugs
Merge pull request #377 from BuracayBeach/team2_v6.1

fix bugs