Preparing WordMap for release

@twinword Made a few modifications here. It's a WIP, but it should be done. :)