bugs fixed except on the html page outputs