Design Fixes, Corrects Typos.