Added doc, fixed map