More copy writing and perf tweaks