Updates to the Roskilde stuff

#80