Clean up some debug, fix self see with libs.