Pulling in developer docs, lots of cleanup, fix map