Multiple fixes.

Changed symbol names for readability. Added handling for punctuation input and one word input.