integrate important fixes