Updates messages and fixes typos in motion