various fixes; now operational again with less bugs