tweaks for safety and info