MAP-900: finishing touches.