Fixed sublime tests. Also up to listing 5.16 on tut
finish layout and routes