remove a lot of debugging, add some more