tiny bug fixes and improvements
Merge pull request #68 from SoftwareEngineeringGroupProject/touchups

tiny bug fixes and improvements