improves and fixes in words