Fixed copy & other tweaks