add grubdate_xchat changes; re-fix /np in mocp