fixing some minor oversights/paranoid commit