Minor changes

Some minor bug fixes & a notice to people trying to use the merge with -d as this hasn't been implemented yet (and may be a while due to the difficulty).