I also did some html things that may be questionable