added ClusterOutHandler, made preparatory changes to s_proto