Remove some ambigous emoticons
Add RIGHT_BOUNDARY