Fix typos
Add rewrite rules