Going to clean up a little.
cleaned up
Merge pull request #923 from monkeyiq/2013nov/issues/879v7

More multichar goodness