removed stl debug hack; formatting fixes for ctip