tiding up testing mapping
minor edits
more updates on mapping