more copy/paste/register improvements