move entry
add and expand references (prompted by work on SATnatex)