More documentation, better HTML markup