Bug fix for lab 3 and more file commits for Lab4