[feature/404-and-fixes] Add 404 and fix minor bugs closes #33