More setOneCat cleanups, bit more debug output