Fixing Typos & layout. Issue #17