a few cleanups while debugging multipoint