fixing bugs
Merge https://github.com/SycamoreRockwell/GroupProject