Added Wliu's Recommended changes, and cleaned up laziness-mistakes.