removed messages, fixed minor things