A bit of improvements