by Alex: fixes for html