Had issues updating on markw after just wiping cache/dalvik, with stuck processes and rebootings.
Trying again after also wiping data ended working fine, the phone crashed once after trying to wake it up with the fingerprint sensor but I suspect it was due to me not rebooting after restoring...