Some experimental things and another map clean up