add word matching. Bug fixes for image embeding
fixed merge issues