more cleanup/debugging