change redirect back to in model, small fixes