more fixes/debugging