Move logging around; update routes