Merge origin/master

error messages added and need to connect tokenletter