Minor updates and html formating