minor improvements/paranoid commit