Imp: Some improvements.