Removed commented out; less debugging left in msg_base, fixed minor syntactical errors.