revision to mandoku.el