Fixed some things in the new message variable