Better testing, and detect BSD, better HTML