Added comments to cmake lists
Now using proper data file for wc, re-organized parts
weird error with 'x', now using 'z' instead