Fixed some details after the big move.