some debugging, cleanup