Amended message with spelling error in it.
Buffer overflow fix.
Fixed merge conflicts.