committing some minor changes
adding files back for BT debugging