Not really any actual changes but some comments and debug prints