Added some smaller changes