Added some comments and support for single files