minor tweaks. still trying to get messages Kryo-ized right.