Update Typo with various bug fixes #3

Merged
merged 9 commits into from Oct 9, 2012