Modify tatweel and ZWNJ

Make changes to make it easier for tatweels and ZWNJ.