some more testing, better debug prints