runtime fixes/additional debugging