Fix a couple small things, trailing ws, remove debug stuff (match)