cleaning up
extract wll_mapper
updated the Changes file