various adjustments and using class for local and remote mode
increased TIMEOUT
using class in source mode