Added a few minor improvement!