Validation on client & small fixes