last few improvements