Update CV, fix addresses