Added run option
Added some comments and additional logging
More logging