Minor updates, fixed merge