extending map support, documented additional stuff