Removed excessive message handling.
Minor fixes.