removed socket references...console capture uncommented
merged files