finish w/ partial tmplate
changes in socket factory
litle changes in st-re