- more bug fixes
Merge pull request #384 from BuracayBeach/team1/bugfixing

- more bug fixes