add timeout variable to config file; general cleanup