Now adds word-relation (context) in both directions. Seems like this wasn't done before. Also some cleanup