smoke bug fixes
Merge branch 'master' of github.com:ArthurYidi/cs224Final
fixed merged