Some tab cleanup & typos
Merge pull request #213 from DJScias/dev-0.3

Some tab cleanup & typos