doc update
unit test cleanup
README update
mapping update