small improvements to print and map