typos fixed
some changes to WP5, 6