Cleaning repo, adding debug info