token parsing; and reformatted socketserver