Make redirect after create/update work
Add more comments