Fix a few stupid bugs, and remove some debugging code.
Fix a few stupid bugs, and remove some debugging code.


stefanseefeld/fresco,stefanseefeld/fresco,stefanseefeld/fresco,stefanseefeld/fresco,stefanseefeld/fresco