more changes, added wstatistics