Add client validation
clean up warnings in servlet