Just a few improvements