copy changes, style tweaks

Signed-off-by: Jim Tattersall <jim@newblack.me>