lastest bug fixes and html corrections