Fixes for routing/rewriting.
Add solutions for session 1.