Made a few improvements