protocol update + minor fixes