updates to html and server