Added some small things…  and some comments