fixed the bugs, commit from home
added comments and push from home