tweaks to output and safety checks