Cleanup and bug fixes in RiWordNet