More fixes and changes.
More fixes.
Merge branch 'master' of github.com:VashishtMadhavan/EE149FinalProject