some comments and removal of custom path