compatibility improvements; final touches.