Cleanup
Include site in watches; Fail on invalid file request instead of returning index